From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 6 Aug 2011 00:21:29 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~61
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5e94390b55a0dcb5d05122e06179e48103b37ef4;p=emacs.git

Merge from trunk.
---

5e94390b55a0dcb5d05122e06179e48103b37ef4